Merge with ia64 tree
authorKeir Fraser <keir.fraser@citrix.com>
Mon, 29 Jun 2009 09:51:35 +0000 (10:51 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Mon, 29 Jun 2009 09:51:35 +0000 (10:51 +0100)

Trivial merge